Refactor json pasring of lists